From f32756e705079d76661b39346bde38431449fc3c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Timm=20B=C3=A4der?= Date: Wed, 22 May 2019 06:55:45 +0200 Subject: [PATCH] gl renderer: Remove some unused api form the GLDriver --- gsk/gl/gskgldriver.c | 52 ------------------------------------- gsk/gl/gskgldriverprivate.h | 2 -- 2 files changed, 54 deletions(-) diff --git a/gsk/gl/gskgldriver.c b/gsk/gl/gskgldriver.c index 4dd603b040..19ad7b1a78 100644 --- a/gsk/gl/gskgldriver.c +++ b/gsk/gl/gskgldriver.c @@ -50,7 +50,6 @@ struct _GskGLDriver GHashTable *pointer_textures; const Texture *bound_source_texture; - const Fbo *bound_fbo; int max_texture_size; @@ -189,7 +188,6 @@ gsk_gl_driver_begin_frame (GskGLDriver *self) } glBindFramebuffer (GL_FRAMEBUFFER, 0); - self->bound_fbo = &self->default_fbo; glActiveTexture (GL_TEXTURE0); glBindTexture (GL_TEXTURE_2D, 0); @@ -220,7 +218,6 @@ gsk_gl_driver_end_frame (GskGLDriver *self) g_return_if_fail (self->in_frame); self->bound_source_texture = NULL; - self->bound_fbo = NULL; self->default_fbo.fbo_id = 0; @@ -332,18 +329,6 @@ gsk_gl_driver_get_texture (GskGLDriver *self, return NULL; } -static const Fbo * -gsk_gl_driver_get_fbo (GskGLDriver *self, - int texture_id) -{ - Texture *t = gsk_gl_driver_get_texture (self, texture_id); - - if (t->fbo.fbo_id == 0) - return &self->default_fbo; - - return &t->fbo; -} - static Texture * create_texture (GskGLDriver *self, float fwidth, @@ -713,43 +698,6 @@ gsk_gl_driver_bind_source_texture (GskGLDriver *self, } } -gboolean -gsk_gl_driver_bind_render_target (GskGLDriver *self, - int texture_id) -{ - int status; - const Fbo *f; - - g_return_val_if_fail (GSK_IS_GL_DRIVER (self), FALSE); - g_return_val_if_fail (self->in_frame, FALSE); - - if (texture_id == 0) - { - glBindFramebuffer (GL_FRAMEBUFFER, 0); - self->bound_fbo = &self->default_fbo; - goto out; - } - - f = gsk_gl_driver_get_fbo (self, texture_id); - - if (f != self->bound_fbo) - { - glBindFramebuffer (GL_FRAMEBUFFER, f->fbo_id); - - self->bound_fbo = f; - } - -out: - - if (texture_id != 0) - { - status = glCheckFramebufferStatus (GL_FRAMEBUFFER); - g_assert_cmpint (status, ==, GL_FRAMEBUFFER_COMPLETE); - } - - return TRUE; -} - void gsk_gl_driver_destroy_texture (GskGLDriver *self, int texture_id) diff --git a/gsk/gl/gskgldriverprivate.h b/gsk/gl/gskgldriverprivate.h index a3cd675dea..ee34ccd092 100644 --- a/gsk/gl/gskgldriverprivate.h +++ b/gsk/gl/gskgldriverprivate.h @@ -52,8 +52,6 @@ int gsk_gl_driver_create_render_target (GskGLDriver *driver void gsk_gl_driver_bind_source_texture (GskGLDriver *driver, int texture_id); -gboolean gsk_gl_driver_bind_render_target (GskGLDriver *driver, - int texture_id); void gsk_gl_driver_init_texture_empty (GskGLDriver *driver, int texture_id); -- 2.30.2